Each module has now a separated file