Remove repository class
Fix path to basic layout