Reorganized base dir and files
Updated motion.py