Cleanup file and directory layout