move files into flatter project structure