New Framework structure, files polish