major refactoring
reordering folder structure