Move all into class folder, prepare for repo rename