Migrate code to fit dir structure design