Moved the layout files to shared folder. Added category