Cleaned up project structure, plus more content