Tidyed file structure