added more packages
fixed filenames
again playing with layout