[IMP] more clean moving objects to only one file.