Re-arranged file structure. Commit 2-3