Refact the package structure
Each device in its own module