Moving classes into classes folder.