Cleaned up the layout directory