Added manifest + reorganized files