Moved everything to src