changed struture of files around, some minor edits