various tweaks
moving files into src directory