Better folder structure and cli flags