Commit 2-3

Re-arranged file structure