Added name to category
Fixed build errors
Cleaned up project