Moved files to proper packages. Added filename as program input