Folder refactoring to suit gradle builds.