project is simple, so let's clean up structure