improve folder structure & remove some unnecessary hacks
9 files changed