Refactor completely initialization files (ow yeah)