Fixed cache & Project Structure!