Changes made to package structure -- also removed some directories