Changed modules structure to allow cleaner multi-files layouts.