Removed 'Controller' from file names
Fixed self-host post build