adjusted directory structure
renamed files and changed directory structure