Small refactoring, changed project name, reorganized file structure