Moved files into different packages. Added some package-info classes.