changed directory structure.
added/fixed stuff
added/fixed stuff