Finished Step #6, fixed the directory structure to match what I'm building with.