refactored directories / controllers updated other things