Adding framework directory and renamed components to lib