Fixes: #4 - Move components from package to own classes