Added initial class and source structure