Restructured core folder

Now it makes more sense.