Updated to use the newer, nested file structure
Moved the source files one directory lower