changed folder structure
overall refactoring