Improve/refactore core and flatten data
Remove useless files