Refactors setup files and test models into subdirectories