Commit 2-3

Re-arranged the file structure.