refactored file structure and removed cache type files etc.