Initial Commit 2

Adjusted file hierarchy