removing more files and moving around packages