Renamed doste to core and improved file structure