controllers updated for new folder structure