Removed unnecessary layout files and refactored to better names.