moving some files around
refactored into charts and parse services