removing unused markup
renamed a few files