diff --git a/.gitignore b/.gitignore
index 6a62767..c368d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,2 @@
-# ---> Haskell
-dist
-dist-*
-cabal-dev
-*.o
-*.hi
-*.hie
-*.chi
-*.chs.h
-*.dyn_o
-*.dyn_hi
-.hpc
-.hsenv
-.cabal-sandbox/
-cabal.sandbox.config
-*.prof
-*.aux
-*.hp
-*.eventlog
 .stack-work/
-cabal.project.local
-cabal.project.local~
-.HTF/
-.ghc.environment.*
-
+*~
\ No newline at end of file
diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
index 0000000..b48856f
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,3 @@
+# Changelog for drbrainfuck
+
+## Unreleased changes
diff --git a/LICENSE b/LICENSE
index 24a8f90..e637cde 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,30 @@
-This is free and unencumbered software released into the public domain.
+Copyright Author name here (c) 2020
 
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute
-this software, either in source code form or as a compiled binary, for any
-purpose, commercial or non-commercial, and by any means.
+All rights reserved.
 
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and
-to the detriment of our heirs and successors. We intend this dedication to
-be an overt act of relinquishment in perpetuity of all present and future
-rights to this software under copyright law.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For more information,
-please refer to <https://unlicense.org/>
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Author name here nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
index 5923bd5..e37d64e 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1 @@
-# drbrainfuck.hs
-
+# drbrainfuck
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
index 0000000..9a994af
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/app/Main.hs b/app/Main.hs
new file mode 100644
index 0000000..de1c1ab
--- /dev/null
+++ b/app/Main.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Lib
+
+main :: IO ()
+main = someFunc
diff --git a/drbrainfuck.cabal b/drbrainfuck.cabal
new file mode 100644
index 0000000..f6890ba
--- /dev/null
+++ b/drbrainfuck.cabal
@@ -0,0 +1,63 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.33.0.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 9fbea002e6987c6029337af23e79a7d02807f8a29debc342b0336a02d9242ae5
+
+name:           drbrainfuck
+version:        0.1.0.0
+description:    Please see the README on GitHub at <https://github.com/githubuser/drbrainfuck#readme>
+homepage:       https://github.com/githubuser/drbrainfuck#readme
+bug-reports:    https://github.com/githubuser/drbrainfuck/issues
+author:         Author name here
+maintainer:     claudio@maggioni.xyz
+copyright:      2020 Author name here
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+extra-source-files:
+    README.md
+    ChangeLog.md
+
+source-repository head
+  type: git
+  location: https://github.com/githubuser/drbrainfuck
+
+library
+  exposed-modules:
+      Interpreter
+      Lib
+  other-modules:
+      Paths_drbrainfuck
+  hs-source-dirs:
+      src
+  build-depends:
+      base >=4.7 && <5
+  default-language: Haskell2010
+
+executable drbrainfuck-exe
+  main-is: Main.hs
+  other-modules:
+      Paths_drbrainfuck
+  hs-source-dirs:
+      app
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      base >=4.7 && <5
+    , drbrainfuck
+  default-language: Haskell2010
+
+test-suite drbrainfuck-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      Paths_drbrainfuck
+  hs-source-dirs:
+      test
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      base >=4.7 && <5
+    , drbrainfuck
+  default-language: Haskell2010
diff --git a/package.yaml b/package.yaml
new file mode 100644
index 0000000..aec3436
--- /dev/null
+++ b/package.yaml
@@ -0,0 +1,48 @@
+name:                drbrainfuck
+version:             0.1.0.0
+github:              "githubuser/drbrainfuck"
+license:             BSD3
+author:              "Author name here"
+maintainer:          "claudio@maggioni.xyz"
+copyright:           "2020 Author name here"
+
+extra-source-files:
+- README.md
+- ChangeLog.md
+
+# Metadata used when publishing your package
+# synopsis:            Short description of your package
+# category:            Web
+
+# To avoid duplicated efforts in documentation and dealing with the
+# complications of embedding Haddock markup inside cabal files, it is
+# common to point users to the README.md file.
+description:         Please see the README on GitHub at <https://github.com/githubuser/drbrainfuck#readme>
+
+dependencies:
+- base >= 4.7 && < 5
+
+library:
+  source-dirs: src
+
+executables:
+  drbrainfuck-exe:
+    main:                Main.hs
+    source-dirs:         app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - drbrainfuck
+
+tests:
+  drbrainfuck-test:
+    main:                Spec.hs
+    source-dirs:         test
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - drbrainfuck
diff --git a/src/Interpreter.hs b/src/Interpreter.hs
new file mode 100644
index 0000000..2d772af
--- /dev/null
+++ b/src/Interpreter.hs
@@ -0,0 +1,104 @@
+-- vim: set ts=4 sw=4 et tw=80:
+
+module Interpreter where
+import Data.Maybe (catMaybes)
+
+data Instruction = TapeLeft | TapeRight | Add | Sub | Out | In | LoopStart | LoopEnd
+
+parseInstr :: Char -> Maybe Instruction
+parseInstr '<' = Just TapeLeft
+parseInstr '>' = Just TapeRight
+parseInstr '+' = Just Add
+parseInstr '-' = Just Sub
+parseInstr '.' = Just Out
+parseInstr ',' = Just In
+parseInstr '[' = Just LoopStart
+parseInstr ']' = Just LoopEnd
+parseInstr _ = Nothing
+
+newtype Byte = Byte Int
+chr :: Byte -> Char
+chr (Byte i) = toEnum i :: Char
+
+incr :: Byte -> Byte
+incr (Byte 255) = Byte 0
+incr (Byte i) = Byte (i + 1)
+
+decr :: Byte -> Byte
+decr (Byte 0) = Byte 255
+decr (Byte i) = Byte (i - 1)
+
+type Tape = [Byte]
+type Program = [Instruction]
+type IP = Int
+type DP = Int
+
+data ProgState = ProgState {
+    tape :: Tape,
+    dp :: DP,
+    output :: String,
+    program :: Program,
+    ip :: IP }
+
+toProgram :: String -> [Instruction]
+toProgram s = catMaybes $ fmap parseInstr s
+
+tapeHelp :: Tape -> DP -> (Byte -> Byte) -> Tape
+tapeHelp (t:tt) 0 alter = alter t : tt
+tapeHelp (t:tt) dp alter = t : (tapeHelp tt dp alter)
+
+data Error = NegTape | LoopNoMatch
+
+errorDesc :: Error -> String
+errorDesc NegTape = "ERROR: '<' not working. Cannot access negative tape positions."
+errorDesc LoopNoMatch = "ERROR: '[' or ']' not working. Matching parenthesis not found."
+
+incrIP :: ProgState -> ProgState
+incrIP p = p { ip = ip p + 1 }
+
+execAdd :: ProgState -> Either Error ProgState
+execAdd p = Right p { tape = newTape }
+    where newTape = tapeHelp (tape p) (dp p) incr
+
+execSub :: ProgState -> Either Error ProgState
+execSub p = Right p { tape = newTape }
+    where newTape = tapeHelp (tape p) (dp p) decr
+
+execTapeLeft :: ProgState -> Either Error ProgState
+execTapeLeft p = case dp p of 0 -> Left NegTape
+                              n -> Right p { dp = n - 1 }
+
+execTapeRight :: ProgState -> Either Error ProgState
+execTapeRight p = Right p { tape = if endOfType then tape p ++ [Byte 0] else tape p }
+    where endOfType = dp p == length (tape p) - 1
+
+execOut :: ProgState -> Either Error ProgState
+execOut p = Right p { output = output p ++ [chr char]}
+    where char = (tape p) !! dp p
+
+data WalkingDirection = Forward | Backward
+
+
+findMatching :: Program -> DP -> WalkingDirection -> Maybe IP
+findMatching prg start wd = case wd of
+                 Forward -> fmHelper start 0 LoopEnd LoopStart (+1) (length prg)
+                 Backward -> fmHelper start 0 LoopStart LoopEnd (-1) 0
+        where fmHelper :: IP -> Int -> Instruction -> Instruction -> (IP -> IP)
+                -> Int -> Maybe DP
+              fmHelper s acc b ob upd limit
+                | acc == 0 && c == b = Just s
+                | c == b             = fmHelper (upd s) (acc - 1) b ob upd limit
+                | c == ob            = fmHelper (upd s) (acc + 1) b ob upd limit
+                | s == limit         = Nothing
+                | otherwise          = fmHelper (upd s) acc b ob upd limit
+                where c = prg !! start
+
+execLoopStart :: ProgState -> Either Error ProgState
+execLoopStart w = case newIP of
+            Just n -> Right w { ip = n }
+            Nothing -> Left LoopNoMatch
+    where jump = (tape w !! dp w) == 0
+          posOrF = if jump then findMatching (program w) (ip w) Forward else Just $ ip w
+          newIP = fmap (+1) posOrF
+
+
diff --git a/src/Lib.hs b/src/Lib.hs
new file mode 100644
index 0000000..d36ff27
--- /dev/null
+++ b/src/Lib.hs
@@ -0,0 +1,6 @@
+module Lib
+    ( someFunc
+    ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..564d880
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,66 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-16.20
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+- .
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+# extra-deps:
+# - acme-missiles-0.3
+# - git: https://github.com/commercialhaskell/stack.git
+#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=2.3"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
diff --git a/stack.yaml.lock b/stack.yaml.lock
new file mode 100644
index 0000000..032c6e2
--- /dev/null
+++ b/stack.yaml.lock
@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    size: 532177
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/20.yaml
+    sha256: 0e14ba5603f01e8496e8984fd84b545a012ca723f51a098c6c9d3694e404dc6d
+  original: lts-16.20
diff --git a/test/Spec.hs b/test/Spec.hs
new file mode 100644
index 0000000..cd4753f
--- /dev/null
+++ b/test/Spec.hs
@@ -0,0 +1,2 @@
+main :: IO ()
+main = putStrLn "Test suite not yet implemented"