Moved around stuff.. prepped for dev