rename variable
refactor directory structure
beta implementation