reorganizing directory and stuff