Move things to src folder