Cleaned up file structure, removed commented includes.
IT'S ALL COMING TOGETHER.