Refactored collision detection

-Refactored collision detection

-Removed package folders because they are not needed in python-style
design at the moment