Chnaged the directory structure to something that makes sense and restored git tracking to all files within the directory tree.