Refactor structure and mention build file dependencies