messed around with dir structure
dir clean up
updated package structure again