Removed redundant files. Added new infrastructure capabilities.