Cleaned up a bit, renamed directories acc to php format for dates