Fixed imports to new dir structure