Move all custom modules into custom folder

#4702