Refactoring folder strcuture