Removed folder paths from import statements