Added files and arranged code