Containable .h improved, removed 2 empty cpp files