refactor paths and add new srcs