Adjust project structure
Beta version
Clean project