improving inertia, new folder structure for master