Improved dir structure, not using jade