Cleaned up the project structure a bit.