Removed images from static library and added groups
Getting ready for framework