Quick fix
splitting files and wiring deps