Renamed some files to function properly with MoKee source