Cleaned up directory

Using ProjectTemplate Library to organize files.