Refactored project

See issue #1