Refactored project structure to be ASP-conform