cleanup
Refactor layout a little before Routering
Merge branch 'directory'
Refactory layout and cleanup, merged directory base before routing