Modularized some files