Adding imp.py
Move files into better structure
Files now ready for branching