grouped related files into folders and updated edit controllers constraints