Overhauled project as Framework, added Container support