Moving files into src
Fixing move to src