Structural changes

Rename some files and project