Removed google classes & added frameworks