Fixed all files the application can be considered V2