Moved over some layouts, app, etc