better file structure and hashing out innerworkings
cleanup