Added UI folder, Moved Custom Modules into Folders