first big changes, cleaning up directory