Refactored code and classes, removing bin for now