initial commit after renaming and cleaning up structure