Reorganizing structure and implementing a first attempt
Commit message?
Updated first go with some receipts