Changed naming convention, added copyright