Uploading old and starting refactored code