cleaned and fix project structure (hopefully)