Removed construct functionality - all files must be able to be used separately of each other