All files moved into framework