Moved existing structure of files to cope with framework installation