move all base classes to the correct folder
remove cache, not used anymore
move helpers