Refactored to standard framwork

Added heirarchy system for better management
Fixed Moving Problem