Changed dir structure for better ergonomy