Better folder structure now.