Refactored project code to make it structured and readable
Removed draft code version