refactoring

moved stuff in folders