Added comments, moved data to data directories