Web API project refactoring and cleanup