Moved everything in src file