Revert "Move files into core folder"

This reverts commit 02257618b057d2587bc2620bf4da4ed695dc37c7.