Cleaned up directory

Using ProjectTemplate to organize files.