re-structured directories and cleanup