Initial commit
improved readability
improved directory structure