PT-1158 - Moves resources to a separate directory
Remove some logic from the controller