Second Commit

Fixing file structure