Refactored projekt structure