Removed most common files
Marked up layout