refactor hdd data & remove unused sources & system -> require