Refactor folder hierarchy
Think everything is ready to be tested now