Moved code to proper structure
Added methods for put, get, remove