Tidied folder structur up.