Some basic migrating of functionality to system folder