Re-changed folder structure (tried new program)