Cleaned up ray template file
fixed merge conflict
Cleaned up code and removed some unnecessary files
added categories