Redoing folder structure(again)
Final redo.