cleaned code
renamed files