cleanup and created proper folder structure
fix after prev commit