Remove excess includes and images
Move away from generic assets directory