New directory structure/file cleanup
Finalized directory, adapted scripts