Rearranged file structure and added contains: to the top of files