Removed Phoenix naming convention
amend layout files to allow use in non phoenix applications