Fix feature according to new project tree