Rearranged file structure

Code now executes out-of-the-box