Added packages for images, changed file structures