Re-arranged files, made an appropriate header file